(state-or-merge): Defvar when compiling.

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 92788ae968fa1c05c305f1adaba13660c06da19c..89e16791076edcbb1e4d2a2d641c81ed9ca4773c 100644 (file)
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -348,7 +348,8 @@ Combining is done according to the specifications in variable
 
        (reverse delim-regs-list)
        )))
-       
+
+(eval-when-compile (defvar state-of-merge)) ; dynamic var
 
 ;; Check if the non-preferred merge has been modified since originally set.
 ;; This affects only the regions that are marked as default-A/B or combined.